From: Reedy <reedy@wikimedia.org>
Date: Tue, 15 Dec 2015 22:30:53 +0000 (+0000)
Subject: Removed User::editToken() (deprecated since 1.19)
X-Git-Tag: 1.31.0-rc.0~8610
X-Git-Url: http://git.cyclocoop.org/%27%20.%20%24prefix%20.%20Wiki::transformTitleToURI%28%24matches%5B1%5D%29%20.%20%27?a=commitdiff_plain;ds=sidebyside;h=4b328d6c2e12d9c37406e3652a52f691a7ae02e6;p=lhc%2Fweb%2Fwiklou.git

Removed User::editToken() (deprecated since 1.19)

Change-Id: I734e9637317c0737e96e963bafb10ef966d6d172
---

diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27
index 0e44e717a5..fa36eb5510 100644
--- a/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@ -188,6 +188,7 @@ changes to languages because of Phabricator reports.
 * OutputPage::appendSubtitle() was removed (deprecated since 1.19).
 * OutputPage::loginToUse() was removed (deprecated since 1.19).
 * Article::loadContent() was removed (deprecated since 1.19).
+* User::editToken() was removed (deprecated since 1.19).
 
 == Compatibility ==
 
diff --git a/includes/user/User.php b/includes/user/User.php
index 2ac0f2c0f6..fed9664abd 100644
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -4115,19 +4115,6 @@ class User implements IDBAccessObject {
 		}
 	}
 
-	/**
-	 * Alias for getEditToken.
-	 * @deprecated since 1.19, use getEditToken instead.
-	 *
-	 * @param string|array $salt Array of Strings Optional function-specific data for hashing
-	 * @param WebRequest|null $request WebRequest object to use or null to use $wgRequest
-	 * @return string The new edit token
-	 */
-	public function editToken( $salt = '', $request = null ) {
-		wfDeprecated( __METHOD__, '1.19' );
-		return $this->getEditToken( $salt, $request );
-	}
-
 	/**
 	 * Internal implementation for self::getEditToken() and
 	 * self::matchEditToken().